From: Dimitris Papastamos <dimitris.papastamos@arm.com>
Date: Fri, 13 Jul 2018 14:23:29 +0000 (+0100)
Subject: Merge pull request #1477 from dp-arm/dp/css-ap-core
X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22/%22https:/collectd.org/%22?a=commitdiff_plain;h=9ceda8b9076e1e09bcd4d2651632c7f7735248d7;p=project%2Fbcm63xx%2Fatf.git

Merge pull request #1477 from dp-arm/dp/css-ap-core

CSS: Add support for SCMI AP core config protocol
---

9ceda8b9076e1e09bcd4d2651632c7f7735248d7
diff --cc plat/arm/common/arm_pm.c
index 4fdb10a5,73d7106b..d0350d6c
--- a/plat/arm/common/arm_pm.c
+++ b/plat/arm/common/arm_pm.c
@@@ -14,9 -14,13 +14,10 @@@
  #include <platform_def.h>
  #include <psci.h>
  
- /* Allow ARM Standard platforms to override this function */
+ /* Allow ARM Standard platforms to override these functions */
  #pragma weak plat_arm_psci_override_pm_ops
+ #pragma weak plat_arm_program_trusted_mailbox
  
 -/* Standard ARM platforms are expected to export plat_arm_psci_pm_ops */
 -extern plat_psci_ops_t plat_arm_psci_pm_ops;
 -
  #if ARM_RECOM_STATE_ID_ENC
  extern unsigned int arm_pm_idle_states[];
  #endif /* __ARM_RECOM_STATE_ID_ENC__ */